//
//  ViewController.h
//  hell
//
//  Created by administrator on 13-8-17.
//  Copyright (c) 2013年 administrator. All rights reserved.
//

#import <UIKit/UIKit.h>

@interface ViewController : UIViewController

<<<<<<< HEAD
@property (strong, nonatomic) IBOutlet UILabel *lb1;
- (IBAction)bt1:(id)sender;
=======
@property (weak, nonatomic) IBOutlet UITextField *lb;
- (IBAction)tt:(id)sender;
>>>>>>> daa48889e61cfca6820c05f5ec102ef505e68b97
@end
